London | 26-ITP-Sept | Maharit Belai | Sprint 2 | Course work - #1543

Before I look at the exercises, this branch needs redoing.

You created this branch from your Form Controls branch, then did your Sprint 2 work on it.

Always make a new branch from main, for two reasons. main is the up to date version of the project, so you start from the latest finished work. And a branch brings along everything that is already on it, so starting from main means your branch holds only the task you are working on.

The second reason is what caught you here. Nine Form Controls commits are now part of this PR, and that is what the bot was complaining about. Your last commit put the Form Controls files back, which cleared the bot, but the commits are still on the branch.

Here is how to redo it. You keep all 26 of your Sprint 2 commits:

git switch main
git pull origin main
git switch coursework/sprint2
git switch -c sprint-2
git rebase --onto main cac261e sprint-2
git push --set-upstream origin sprint-2

cac261e is your last Form Controls commit. That line tells git to take everything you did after it and put it on top of main instead.

I ran these commands myself before sending this. All 26 commits move across and the files end up exactly as they are now, so you will not lose any work.

Then run git log main..HEAD before you open the PR. You should see 26 commits, all of them Sprint 2. If anything else shows up, the branch was made from the wrong place.

Open a new PR from the new branch, link to this PR in the description, and close this one. I will go through the exercises there.